From 436e75c34c5304d53c11fd2d63646be4eef9cb8b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 24 Dec 2010 20:01:24 -0500 Subject: [PATCH] Add deprecation guards for deprecated grab APIs --- gdk/gdkdisplay.h | 2 ++ gdk/gdkmain.h | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index c7732f35de..4307bd9524 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -132,11 +132,13 @@ GdkScreen * gdk_display_get_screen (GdkDisplay *display, GdkScreen * gdk_display_get_default_screen (GdkDisplay *display); #ifndef GDK_MULTIDEVICE_SAFE +#ifndef GDK_DISABLE_DEPRECATED void gdk_display_pointer_ungrab (GdkDisplay *display, guint32 time_); void gdk_display_keyboard_ungrab (GdkDisplay *display, guint32 time_); gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display); +#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_MULTIDEVICE_SAFE */ gboolean gdk_display_device_is_grabbed (GdkDisplay *display, diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h index 7b6c624b08..963654236b 100644 --- a/gdk/gdkmain.h +++ b/gdk/gdkmain.h @@ -71,14 +71,16 @@ G_CONST_RETURN gchar *gdk_get_display_arg_name (void); /** * gdk_get_display: * - * Gets the name of the display, which usually comes from the DISPLAY - * environment variable or the command line option. + * Gets the name of the display, which usually comes from the + * DISPLAY environment variable or the + * command line option. * * Returns: the name of the display. */ -gchar* gdk_get_display (void); +gchar* gdk_get_display (void); #ifndef GDK_MULTIDEVICE_SAFE +#ifndef GDK_DISABLE_DEPRECATED GdkGrabStatus gdk_pointer_grab (GdkWindow *window, gboolean owner_events, GdkEventMask event_mask, @@ -88,6 +90,7 @@ GdkGrabStatus gdk_pointer_grab (GdkWindow *window, GdkGrabStatus gdk_keyboard_grab (GdkWindow *window, gboolean owner_events, guint32 time_); +#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_MULTIDEVICE_SAFE */ #ifndef GDK_MULTIHEAD_SAFE -- 2.30.2